summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2012-11-11 17:42:56 +0100
committerÉtienne Loks <etienne.loks@peacefrogs.net>2012-11-11 17:42:56 +0100
commitf4c1634f8df3cd4319ecd9f6176e518c45006de7 (patch)
tree546c0df13aa335fb7bda491e106bad6db01ebce5
parenta4dd8f843811a2c8e3b0d95aa3d00f7917533652 (diff)
downloadChimère - projet Saclay-f4c1634f8df3cd4319ecd9f6176e518c45006de7.tar.bz2
Chimère - projet Saclay-f4c1634f8df3cd4319ecd9f6176e518c45006de7.zip
Templates: Fix detail formating
-rw-r--r--static/saclay/css/styles-saclay.css8
-rw-r--r--templates/chimere/detail.html6
2 files changed, 11 insertions, 3 deletions
diff --git a/static/saclay/css/styles-saclay.css b/static/saclay/css/styles-saclay.css
index c106e8e..f99a422 100644
--- a/static/saclay/css/styles-saclay.css
+++ b/static/saclay/css/styles-saclay.css
@@ -2273,3 +2273,11 @@ input#id_name{
left:auto;
right:28px;
}
+
+.properties{
+ padding: 2px 1em;
+}
+.properties p{
+ padding: 0;
+ margin:0;
+}
diff --git a/templates/chimere/detail.html b/templates/chimere/detail.html
index 9c7d86a..4c284eb 100644
--- a/templates/chimere/detail.html
+++ b/templates/chimere/detail.html
@@ -23,9 +23,9 @@
<div id='description_long_{{marker.pk}}' class='description description_long'>{{ marker.description|sanitize:"p b i br hr strong em span:style a:href:target ul li ol h1 h2 h3 h4 table td tr th"|safe}}</div>
{% endif %}
{% endif %}
- {% for property in marker.getProperties %}
- <p id='{{property.propertymodel.getNamedId}}'>{{ property.value|sanitize:"p b i br hr strong em span:style a:href:target ul li ol h1 h2 h3 h4 table td tr th"|safe}}</p>
- {% endfor %}
+ {% for property in marker.getProperties %}{% if property.value %}
+ <div class='properties' id='{{property.propertymodel.getAttrName}}'><strong>{{property.propertymodel.name}}</strong> : {% if 'http://' in property.value %}<a href='{{ property.value|sanitize:""}}'>{%endif%}{{ property.value|sanitize:"p b i br hr strong em span:style a:href:target ul li ol h1 h2 h3 h4 table td tr th"|safe}}{% if 'http://' in property.value %}</a>{%endif%}</div>
+ {%endif%}{% endfor %}
{% if marker.multimedia_items %}
<a href='#' id='show_gallery_link'>{% trans "Show multimedia gallery" %}</a>
{% endif %}